From: Jan D <jan.h.d@swipnet.se>
Date: Sat, 23 May 2015 10:28:54 +0000 (+0200)
Subject: Merge branch 'master' into cairo
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~2819^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6aaa489dc112f51f6045f79b37cb78dd513e398f;p=emacs.git

Merge branch 'master' into cairo
---

6aaa489dc112f51f6045f79b37cb78dd513e398f